From 49003727b66946bd12fa0bbff5b095dee91fac80 Mon Sep 17 00:00:00 2001 From: Jay Belanger Date: Wed, 1 Aug 2012 10:36:37 -0500 Subject: [PATCH] calc-mode.el (calc-set-simplify-mode): Use `cond' instead of nested `if's. --- lisp/ChangeLog | 5 +++++ lisp/calc/calc-mode.el | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8c4dfdb3382..c08a23aea40 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-08-01 Jay Belanger + + * calc/calc-mode.el (calc-set-simplify-mode): Use `cond' instead + of nested `if's. + 2012-08-01 Glenn Morris * progmodes/autoconf.el (autoconf-definition-regexp): diff --git a/lisp/calc/calc-mode.el b/lisp/calc/calc-mode.el index 333485d8f94..f64e37dc0bf 100644 --- a/lisp/calc/calc-mode.el +++ b/lisp/calc/calc-mode.el @@ -497,11 +497,11 @@ (defun calc-set-simplify-mode (mode arg msg) (calc-change-mode 'calc-simplify-mode - (if arg - (and (> (prefix-numeric-value arg) 0) - mode) - (and (not (eq calc-simplify-mode mode)) - mode))) + (cond + (arg mode) + ((eq calc-simplify-mode mode) + 'alg) + (t mode))) (message "%s" (if (eq calc-simplify-mode mode) msg "Algebraic simplification occurs by default"))) -- 2.30.2